diff -u -r ../go/src/os/user/lookup_stubs.go ./src/os/user/lookup_stubs.go
--- ../go/src/os/user/lookup_stubs.go	2017-02-16 20:12:24.000000000 +0100
+++ ./src/os/user/lookup_stubs.go	2017-03-18 01:30:48.037398455 +0100
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !cgo,!windows,!plan9,!android
+// +build !cgo,!windows,!plan9
 
 package user