Merge "Remove MemMap dependency on libbacktrace" am: 93fea8afb2
am: 6d59026971

Change-Id: Ica6bd3505e0f2ab893115fadf272879a034f1206