Merge "Add additional flags to make ART_TARGET_CLANG function with 3.5."