Merge "HwBinder: Remove use of IHw class."