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

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

Change-Id: I52d5bec70a17f053214563b8f0e2ff36e3fb5c1c