Merge "Reduce strerror(3)'s impact on .data.rel.ro." am: d264aaf95d
am: 6b16fcc713

Change-Id: I52f8a463b1fb88bde3d4d640dbca7f194b429824