Merge "Remove ART hack to create hiddenapi-flags.csv"
am: 3a8761f845

Change-Id: I1553a63dd79452d61f6e849f66d50eb360d26d04