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

Bug: 120848293
Change-Id: I9dc560a17ebb639c244a84e7750312547eac7d57
tree: bd0725018d01a52d7b6cc2b5dbfb44e1e4e98320
  1. 6515/
  2. 65xx/
  3. Android.mk