Merge e2340b3eccad3462b6f31c4476d572d71e36a840 on remote branch

Change-Id: I10af52759c2a38803b468681243814206adcefa5
tree: fc1d9b27fc316702df1d047d29055251d7cea7b7
  1. oem_template/
  2. src/
  3. testing/
  4. Android.bp
  5. Android.mk
  6. OWNERS
  7. proguard.cfg
  8. README