[automerger skipped] Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev
am:303a891220-s ours am skip reason: change_id I128a007749356d4a8d75eba3e2c678c0f66c59fe with SHA1ef6a7da0f9is in history Change-Id: Id71082f72c31a3e6eb49ef402936f16bb866214f
This commit is contained in: