Merge "Revert "Support class unloading in dex2oat for quicken multidex""