Merge "Enable class unloading in dex2oat for quicken multidex" am: 3ae12d56a9
am: bd4c3117fe

Change-Id: I42b1f0ded18ef10fb0539b9405339e301a4309a5