Merge "Fix ART builbot after hiddenapi files change"