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

Change-Id: I5aad791721158976d6a0ede27450e67bd5f364eb