Merge stage-aosp-master into pi-dev-plus-aosp
am: 2e175894e7

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