Merge 7f645fa641c96551be35fa8ac8c3bbef2aab4b41 on remote branch

Change-Id: Idc2340d03eeb3578362fe93bb7fd61e8df9f0d4d
tree: 12ebe2b71a6125b4e154b011283d4e69127fb91e
  1. src/
  2. Android.bp