Merge "Use a lock in RaceGenerateTask around dex2oat."
am: 34773b468c

Change-Id: Iaf2285b8bafc610427a273522f99340c776c5c8b