Merge "ART: Refactor libarttest C++ code"