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

Bug: 120848293
Change-Id: I72b21d1e5d9fabbdffa3f6451125accd835cc4d0
tree: b0ce89dcf422ba60eba80d917dc443e8d278b4c1
  1. oem_template/
  2. src/
  3. testing/
  4. Android.mk
  5. OWNERS
  6. proguard.cfg
  7. README