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

* commit '7c0effcb99dea080ece38fc76c7f8ca7b9bd9060':