Merge "Better errors in PackageManagerTests" into gingerbread