Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20b

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1999014

Change-Id: I20cae4c45f74d4d3888a0f6e36e2c48badff6638