Merge "Use mean CPU time in an attempt to reduce test flakiness" am: 7d06b37270 am: b6b8fd1c65

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

Change-Id: Id360f1cef8ef64101acfbdec6974a7bd4778ad66