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

Change-Id: Ic99556f0d4a201fbf170e9e8624bc9fe8bf714db
BUG: 129345239
tree: 8d9193d5aac2809c9269210d353ab1fd06704c35
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS