Merge "libhidlbase / libhidltransport is static" am: 6c99a6719d
am: 2da6f65b02

Change-Id: I65fb34ca9860ccbe1639a88cc1c01bfb48388e36