Merge e19228fe3c58e58aa1a0911d819a8ddcac41fffa on remote branch

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