Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 4faff14b4f

Change-Id: I91a06d5bdc21688ae57d781044c332fd5d90dccc
tree: 9d8d14a95523d2af62a9ed2e04b7f3f438bd833b
  1. oem_template/
  2. src/
  3. testing/
  4. Android.mk
  5. proguard.cfg
  6. README