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

Change-Id: I09c03a4820b21c4136f259959818736cadfc28cd