Merge "Disable 660-clinit for no-dex2oat"