Merge "Fix ART compilation for Clang 3.5."