Merge stage-dr1-aosp-master into stage-aosp-master
am: be972ec7ea

Change-Id: If3208bca0ff5fabe80ddc94f06ff24d3114c8938
tree: a4b5504e2877a45d3d5d010a10c168761ee9af12
  1. camera2/
  2. common/
  3. framesequence/
  4. photoviewer/
  5. widget/
  6. CleanSpec.mk
  7. OWNERS