Merge "Deterministic DexCache in heap images." am: a6cefa7de1
am: e21768e115

Change-Id: Icb8229956cfa21433d265c979c24cbff701628d6