build:  fix merge derp

Change-Id: Ibe1b9da0a51ed593fe8d564ad33d5edae8c38ecd