[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 25dc069c8a -s ours
am: cd18025fdd -s ours
am skip reason: subject contains skip directive

Change-Id: I7fe062276f27f44b1726ed18bc72025c452a4796
tree: 94484d2af6ecd3ad3afcfc262e2b61af0262f05f
  1. oem_template/
  2. src/
  3. testing/
  4. Android.mk
  5. OWNERS
  6. proguard.cfg
  7. README