build script tweaks

Change-Id: I91514fadb2677bcf9d2811b249e664b0f16d8cd0