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

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

Change-Id: I4cae650637380812ffb068322312f77edcdc9e63