Allow building with -pipe

Change-Id: Ibf5ac92de9189689694b665185d4eaca0c2dc2bd