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

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