Merge "Support class unloading in dex2oat for quicken multidex" am: 18e91619f3
am: 9c6807bae5

Change-Id: I49beb37a35a09b92ce82d6eb8c06ee86041140f3