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

Change-Id: I0acd32bfd6f3e4e15f74c5d8506c9ab86147efa1
tree: 4483510c75d81dba7eb1ac167875950cbeae805b
  1. src/
  2. Android.bp
  3. COPYING
  4. MODULE_LICENSE_APACHE2