Merge 21e024675fd4d7748f6d31b9def88ee7798e1cc5 on remote branch

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