track our merged libhardware

Change-Id: I81fdd16c965cfffdc49443f6a5aac40d9e7e564d