Merge master@5428150 into git_qt-dev.

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