Merge "Disable 660-clinit for no-dex2oat"
am: 2f153cf2f2

Change-Id: Iecd98e842c8df6e9e81006efa5c153fedd610c16