Merge "Disable aidl tag tracing in libbinder_aidl_test_stub"