Merge "Match argument order in cpp file" am: a3d0bf05c3 am: d07017f882 am: f288660ed3

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

Change-Id: I88752bb8321cfa9a31c0eb4f431d1209ec979af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>