Merge "Remove libhwbinder/libhidltransport deps" am: bf7fd5c828
am: ee61593d21

Change-Id: Ic42146e363eb5eff124d8a3456ff7f8f773ff1f2