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

Bug: 120848293
Change-Id: I96f59994f0406b279a3706e29bd06dd3959d5980
tree: ac6f7b1c49adc54092bcd2a3f4f0394a6bb071f8
  1. Android.bp
  2. java/