Some type renames were missing in the android file from CL 79017

Change-Id: I419215575ca7975241afb8d2069560c8b1d142c6
Reviewed-on: https://go-review.googlesource.com/79136Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>