Merge "Fix pm.dexopt.first-boot for eng builds"