Merge master@5406228 into git_qt-dev-plus-aosp.
am: 0e4dbd7961

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