Merge "Revert^3 "Move tracing calls to libbinder_ndk"" into main