Merge 209d3c9663882026745db9bb122b88d68de11e13 on remote branch

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