Merge 30356b263510f4015bafab6e912282095f887cdf on remote branch

Change-Id: I35eed0a61ef10dbcb37087a5acd88554475d7056
tree: 1f168a6958f2f14e6b392b0f97e1ed7e9fafa913
  1. 1.1/
  2. 1.2/
  3. extns/
  4. halimpl/
  5. Android.bp
  6. OWNERS