Merge master@5428150 into git_qt-dev-plus-aosp.
am: 7e153d6ebf

Change-Id: I5e1f2eb619b57bba257ee8a0a8b4b46007c425c3
tree: 443afd9045c8d3989ce4dac34bd6ebb378b5ddab
  1. maven/
  2. Android.bp
  3. LICENSE
  4. OWNERS