Edit build configs

Change-Id: Id674e86e79950ed664ef0b7eea1572c4149ec7bd