Copied from 5400043 since they stand alone from inlining. R=lvd CC=golang-dev https://golang.org/cl/5479046
