Add build variants

Change-Id: Ib54fdc2e89359d703185b05c48d77bb77bf52ca5