Merge "Revert "On userdebug/eng builds, disable compiler optimizations in ART""