Update build scripts

Change-Id: Ia2b18d8f59aecd1ab7acf2bf6526a901e215bc51