Merge "Revert "libhardware: make memtrack vendor only"" into main