Android Mainline 10.0.0 Release 5 (6004948)
Combine libhwbinder into libhidlbase.
am: 9f53eda37f

Change-Id: I2904eafad59ec5772a3e5d1fc2a75123dbcae25e