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

Change-Id: I80f1e7b21251888ffaf7b6980b015970820097bc