Update Build Script

Change-Id: I38f3221b88667cd384cd9572198275e021f2b0f2