Fix 626-const-class-linking for no-dex2oat configuration.
am: 0ba0c7d9b0

Change-Id: I401dde049079e642520d3f7a1f721a226b9879ad