Merge "Follow rename of dex_preopt to dex_preopt.enabled"