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

Change-Id: Ia5735a5cc2022f994af07161e47ec57ec0bed1f8