Merge pi-dr1-dev to aosp-master
am: 04f5241323

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