Tracking libhardware and branch change for native