Merge "Remove performBootDexOpt and am's ensurePackageDexOpt."