Merge "Remove libhwbinder/libhidltransport deps" am: 6cffe44e0f
am: b7d2632c22

Change-Id: I93c5296391c469571e153e5366ee90ab9754ea9c