Merge "Fix ART build issues."