Merge "Clean up the cleanup method" into pi-car-dev
tree: 86f3554dc60ac8c0b5cf04e97a5ad1fe68c2a931
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml