Build both 32 and 64-bit versions and don't limit it to eng. Change-Id: I5d6cc8005291100d5fe0f1385e8a0b4ba5f4d630