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

* commit '7831c56ef524df688b6fe7a151671c92a6938837':
  Handle libcore, dalvik, gov imports.