Merge "DO NOT MERGE Fixing the failing tests" into pi-car-dev
tree: 1e25a99d210bb1624a08a699473ebd7cd9a06cc3
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg