Merge "Ignore deliberate free() of non-heap memory"