Merge "ART: Fix space trimming in oatdump_test"
am: 9be57cee98

Change-Id: I8a317bbe3b8635b34320a9ea77bf39cda4dbf05c