Merge CM's display-caf-new/libmemtrack