Merge "Create maps for libunwind only if they changed." am: e92a2d8a43 am: ddd9efdc77
am: 649577cdb0

Change-Id: I69d8df1380e8793aeaa24456518d897e59c30cae