Merge "Minor cleanup of build.go." am: d8c099e12d

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

Change-Id: Ia289e0dbbcb39b8e523462804db666c2d78737e5