Merge remote-tracking branch \'aosp/upstream\' into master am: 0c42d4b3 am: f3eeb928 am: cdaa819f am: d7362bc6 * commit 'd7362bc6': Add blueprint_go_binary for user-run tools Change-Id: If3e62d1b3fb2d5f001eab540a2e3f0834b0a3859
