Merge "Generate .toc for android_stubs_current.jar"