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

* commit '6cf9ae5b6bc8b3bebd9769617c06845402b0a7a5':
  Generate .toc for android_stubs_current.jar