Merge "Move dexpreopt image selection out of dexpreopt_gen"
am: 8f4e0f2939

Change-Id: I55321f2af249bf5a7c2c644b7dc6408439be3ecd