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

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

Change-Id: Ide5b543d6531ed0b2d11736e77664ff3f3963049