am a46dbf03: am 5df7f784: Merge "ART: Refactor libarttest C++ code"

* commit 'a46dbf03abcdf1b662be1cbe25ea6409b3e4cdbc':
  ART: Refactor libarttest C++ code