Merge "Remove libhwbinder/libhidltransport deps" am: edf8e5715b
am: 5e9e74ffd2

Change-Id: Ifd7ab96c69f19fb3367d0c99c91a3304879232e9