Merge "Bring back Binder atrace symbols" into main