Merge "libhidladapter is now static."
am: 21796bf031

Change-Id: I4b44774a965ae847c085326fe8f0c3c2b18551ed