Merge "Fix godoc typos." am: d999938a am: 6df52756 am: b89f8537 am: 0a12cee3 am: 1ac15446

Original change: https://android-review.googlesource.com/c/platform/build/+/2628611



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