Switch to unified moto builds

Change-Id: I3d65d68225010336b9aafab1ecceeb05cf67f820

Conflicts:

	default.xml