Merge changes from topic "combine-libhidlbase-libhwbinder" into qt-dev
am: 303a891220

Change-Id: Ibc1c5fb1ccc095250f979b7720c6446ef71ea27b