Merge "bionic: fix broken end atrace events" am: e8cc2c32ac

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

Change-Id: I7ed065c8ab5f4a51e92221560f2fb887d08c3bb6