Update Build Script

Change-Id: Id1a11323eb60b38086209ddcea8247e0ebd448a9