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

Change-Id: I47705e6ce7a20151e487c69bd44ee9ef0d67c109