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

Change-Id: If8f876b3422fbe7a59ca310310af8a1082eb14d0