* aosp/upstream: Fix compiling binaries with go 1.13 Test: treehugger Change-Id: Ib600e4a950ed5a0c163946a023f70a611eaad696