Merge "Revert "Support class unloading in dex2oat for quicken multidex"" am: b00c8b0767 am: e7c3855937
am: ef97b1528a

Change-Id: I838eaa175e0e11c3a56b04fa74abafaa1aeaa537