Merge 2f300c2503208ce91e3104db1ba23588bab0c0ac on remote branch

Change-Id: Ic558386d5b525348c315ed155ee56db4ce3e4911
tree: fbac0cfc267d948164093b84946cb6669659b2d7
  1. android/
  2. export/
  3. LICENSE
  4. METADATA
  5. MODULE_LICENSE_CCBY
  6. OWNERS
  7. README.android