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

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