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

Change-Id: Idde5694704a31fbf50d23f1bd71480980debc5e6