Merge "Remove ART hack to create hiddenapi-flags.csv"