Merge tag v0.5.9 am: 380e26f982 am: 8bddf39794 am: 33ef859425

Original change: https://android-review.googlesource.com/c/platform/external/go-cmp/+/2320808

Change-Id: I14b6ad6891b5023adcbb19c4f53bab9b8dd9eea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>