Recombine hidl lib build. am: 55d2dcd389 am: 3ed069145a

Change-Id: I6a335b5dc996fea5af3a9af37772af15a7cb29c2