Dev build script update

Fix some minor bugs that broke the build process.

Change-Id: Ie29296fbc65d7ef5e74a8832474d42b32ef8bccd