Merge master@5428150 into git_qt-dev.
am: a80753cece

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