Merge "Test ...libhwbinder-impl static." am: 06adbd75e5
am: 18494b89b2

Change-Id: I53c8fb049911e8bfdfa79661b06739aa1c2ee7c1