Merge "libhwbinder users use libhidlbase"