add back MotoX and introduce unified builds

Change-Id: I7a8745e0041f9cb40f6299ee0d4e2d9ac37edac6
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge "add back MotoX and introduce unified builds" into kitkat