Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: ee6728562d

Change-Id: I5f291b67915bec1928a4789acddc91d4cb87b3a8
tree: c25abc7adacdd4385e0d882255948dc246726535
  1. light/
  2. media/
  3. pixelstats/
  4. Android.bp
  5. CleanSpec.mk
  6. current.txt
  7. OWNERS