Merge "Merge "Remove trailing whitespace in dexdump golden output." am: c8f2e4d20b am: def0fd4b34 am: a91c5e462c" into main-plus-java-next-dev