Merge "Update update_rs_prebuilts.sh to explicitly make support lib jar"