Merge "Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contents"