Merge "Skip APEX when doing dexopt"