Merge "gofmt -w build/art.go"
am: 9f35dd464e

Change-Id: Ied137a54ab7e41192fff8abc0f162d53eb3ac63e