Build: Use this setup for now...

Change-Id: Ib15940d41c985efa7407c764b04ee8d019943c2c