Merge "Minor fixes on builder sections on go/android-api-guidelines" into main