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

Change-Id: Ibd0348178bb35f5c4265eba52d8fee644b7a08f6