am 800c215f: Fix the build

Merge commit '800c215fa89f913626510adc01bdb6b8f4dec041'

* commit '800c215fa89f913626510adc01bdb6b8f4dec041':
  Fix the build
tree: 81ac3bd091ec6ba3fd96da533d4034641cf4dc46
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE