Merge b534ed595

Change-Id: I89439b93b4ba3eb685ecd9ed7d4bd97bb86e3198
tree: eb567ab85c2c1467fa2bf03a8c5681674dd585bc
  1. java/
  2. MODULE_LICENSE_APACHE2
  3. NOTICE
  4. README.android