am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce

* commit 'b281a6463f22c75c5b4a7a7079bdb55e484c2d07':
  Fix video capture intent overlapping buttons
tree: 4ebb75a3aa8ba88c75134e11829e240099f0e3d1
  1. gallerycommon/
  2. jni_mosaic/
  3. src/
  4. src_pd/
  5. tests/
  6. tests_camera/