Manually merge changes from giant AOSP topic

Change-Id: I65b5a4265f8a8fd37daa763c57e73c25cf7a4376
tree: 532ff1842f9315b1e2c149f68ac9d5c5ad8a486e
  1. oem_template/
  2. src/
  3. testing/
  4. Android.mk
  5. proguard.cfg
  6. README