Merge "Re-enable optimization for clang arm64 art builds"