Updated build script

Change-Id: I97710baf8aef0fbd6080ff2411f437d39a2db709