Recombine hidl lib build. am: 55d2dcd389

Change-Id: Iacd7a5b2c8c674d0907746d956f3f4c6d60a85df