Merge "Clean up the cleanup method" into pi-car-dev
am: de60608b52

Change-Id: I4690dbd90c4e369a2d9a5ff5ba4bff5daaf3f324
tree: ffa70413bb2cf59a70a5dd7ba0a485e45dbd2d90
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml