Merge "~Memtrack: don't delete hw_module_t*" am: fb9821c8f0 am: 464c9cd3ba am: 5edf1dec6f

Change-Id: I4493d359dbb975f1791e0157dee3d8d3dcd65ee3