Update build scripts

@ankurkotwal PTAL