Merge "NGREG != ELF_NGREG." am: a5a9992671

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1419433

Change-Id: I9447c49cd08bfac0f127229455529bffdfd23c56