Merge "libhidladapter is now static."