Merge "DEXOPT_FORCE may be passed for primary apk as well."