Update Build Script

Change-Id: I528e1469249b62f1fd087e882eb40efb51719d6c