Merge "Fix DumpNativeStack function for traced methods." am: cf23c5d8e5 am: e52143bf19
am: 12750ed763

Change-Id: I4501b391358cef5d63a107f03b7990d06e242d84