The changes to internal/mobileinit fixes golang/go#26298; the changes to the app package are only the easy pickings. Fixes golang/go#26298 Change-Id: I1ac49c57e417b852cb5ab1bdcb18c73db8c4475a Reviewed-on: https://go-review.googlesource.com/122897 Reviewed-by: Ian Lance Taylor <iant@golang.org>