am 361a6ad1: Merge "Handle native library deletion in scanPackage" into gingerbread

Merge commit '361a6ad16dedfed871c76e8fa64eb45aa82a0088' into gingerbread-plus-aosp

* commit '361a6ad16dedfed871c76e8fa64eb45aa82a0088':
  Handle native library deletion in scanPackage