[automerger skipped] Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev am: 303a891220
am: 738d6b8950 -s ours
am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1 ef6a7da0f9 is in history

Change-Id: I38dc2e57e4bcdf09f4c3a2b08403b3e12cdf41ae