Revert "Tweak app makefile with extra resources" am: 6465557d68
am: d19f034f42

Change-Id: I26ca461ad4c9efee888576b964f4d1a91fdffb37
tree: 63c6dab1c00ba30f4f4cd4b6dab331cadf37f577
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml