Merge "Fix build-host-prebuilts.sh and make-release.sh"