Merge c47ebaf426861257f0a242a7c9b51873d57eba19 on remote branch

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