Merge changes Ibbf16955,If88b6594 into pi-car-dev
am: c81ce4cccc

Change-Id: I7ce82ca3dcecc5c6f7aa0ff83d80576c4b7cfe1a
tree: b5810e712884f407f4a6cb22a830d58b9af80007
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg