Merge "Handle native library deletion in scanPackage" into gingerbread