Fix for core dump  while destroying NAHeap

Mutex in NAHeap was used after calling NAHeap destructor and this was causing
core dump sometimes.

Change-Id: Ic2bd7c77b9109b055a0718247a5e04016018434e
Merge "Fix for core dump  while destroying NAHeap"