Merge "Make update-makefiles.sh exit if any of the hidl invocations fail" am: 11dc298105
am: 3e07d42ba3

Change-Id: Id6f07d7d10cc9a9a5928057b0621914ff18e1454