Switch to xbuild

Change-Id: Icf8c40775d973bd160e79349e0c48bee8986a766