Merge "Update calls to dexpreopt_gen"
am: 0450863eca

Change-Id: Ied274cfd1a5d84fca0670b371a5ec820d11e79af