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

Change-Id: I76e17c917fb574516266711bd5f20f7554dc5732