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

Change-Id: Iacc2ff8e449057a54c17688bbed22cf9554b7e61