add back MotoX and introduce unified builds

Change-Id: Iac8a9202607375188a2a96264c70828d0d966fcf
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>