Switch to unified moto builds

Change-Id: I3ff744ccd6ee8ca61be0cf3a42cdb193402bb907