Merge "Generate .toc for android_stubs_current.jar" am: 6cf9ae5b6b
am: 477d5d1770

* commit '477d5d17709c0a95064f6ac17eeaa6d46a40b777':
  Generate .toc for android_stubs_current.jar