Patch Hardware LibHardware Legacy

Change-Id: I09c243f5e23cd2b79ca2756d2f9110ca4e540ccf