Merge commit '1b68b7876a0e373fd673683df31afc2aed1884ae' into HEAD

Change-Id: I2997b665a1b715d372712d1af60e67df955791da
tree: af025d1cf1d931be209261f8f9e8892ec7bf3b58
  1. Android.mk
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/