am a71294be: (-s ours) am bbe63c7c: (-s ours) Reconcile with jb-mr2-release - do...

* commit 'a71294be477249bda2e42c86293bf0a72a528272':
  am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
  am 3ccb0e3e: Add a cleanstep for the build server...
  am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce
  am 0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce
  am 978f4aae: Fix for crash upon saving image
  am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce
  am 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce