Merge "ART: Let benchmarks import new header library" am: 269a399829
am: b7fac211af

Change-Id: Ie8df45169037240e1cd812c4e4c4eb45ad927b1d