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

Change-Id: If72e3c0a2627cf621d2584431c20b40938076031