Merge 098658f0f236b87f33298b7fa2f49f9ffa76820c on remote branch

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