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

* commit 'cea9687c9d2059647934262141a4bf555c8ffe26':
  Generate .toc for android_stubs_current.jar