Merge "libhidl: add withDefault" am: 114d71cae7 am: 766030761a
am: c7488fab36

Change-Id: I2700cd39b08f394f01256bed6f75b4816aa4948e