Merge "DO NOT MERGE Include cleanup from ag/5624122 to prevent merge conflicts for changes in files." into pi-car-dev
tree: 4563a39444275f15d3c752dc6718e27bf25322b8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg