Merge "Make update-makefiles.sh exit if any of the hidl invocations fail"