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

Bug: 120848293
Change-Id: I1a65f576c9641ac1fda99ba5ee9a487bf75973f5
tree: 8d430fe286e67dc62ca456d3cd3c18a854bc18ce
  1. Android.bp
  2. CleanSpec.mk
  3. src/