Merge "bionic_systrace: moving global static variables" am: 37e112f60a

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

Change-Id: I0468e27337caf48cbec68b6d275fb828b5351bed