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

Change-Id: I01dfc6d0b1b4ad9fb7d6d6d03ce55246c702444c