Merge "Revert "Tweak app makefile with extra resources"" into oc-dev am: fb63fc2c6b
am: 0f06aaa508

Change-Id: I54faf5198a845a0c123e46d4e49a04bc1751a9b7
tree: 69b65fe930928468ae868297cca84116c1b74a9c
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE