Merge "ART: Fix space trimming in oatdump_test"