Merge "installd: fix bugs installApkVerity"