Update build scripts

Change-Id: I8d7d709858d6e8d9576aa387f8d2782579c5b210