m8: unified builds

Change-Id: Ic2d1d46611c441bbc0c402e55c4bd65f76eb2f83