Merge "Re-enable optimization for clang arm64 art builds" am: 2cd15c35df
am: 015924124a

* commit '015924124af455d38aa2a381312d95c8e4b95ce2':
  Re-enable optimization for clang arm64 art builds