[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: b860811af3  -s ours

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