Better build script

Change-Id: I4b03ed8e480654c67998765fc11dbdd3ca7f9f53