fix merge

Change-Id: Ibcf2f59a382d2fc7b428f2f15c2f6b6664e1bb1d
PackageInstaller: hdpi drawable

Change-Id: I9772c5210352b9184c23dd04d6dc950743e99bd2