Update build script

Conflicts:
	exportlocal

Change-Id: I967e3bb07b239941ea51af6b09d61d7b08138f44
Merge "Update build script" into du44