DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Iaaaf3b7106f96ced6cc11cc79ab721611a9c15b3
tree: 34910f2f4131bbac9293f5730ddff6e44b568d36
  1. arm/
  2. arm64/
  3. common/
  4. x86/
  5. x86_64/
  6. Android.bp