am 5456310c: am ee4f9461: am 9182d368: Fix build error

* commit '5456310ccd30235c5ea7298996c69ac54edbb1ec':
tree: 648b1d3d905516553b8a4d7062ab5a96d317d54b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml