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