am 996b60be: am 7831c56e: Merge "Handle libcore, dalvik, gov imports."

* commit '996b60be9b74d1f42a959600895b3a25c622bd74':
  Handle libcore, dalvik, gov imports.