Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: Ib8a7f3454d509d68d62210f286107d4f07fb86c2
BUG: 129345239
tree: 6e68b9bbe8ddbffbfbfcdff3b54b28b6e18b0e81
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml