Merge "Revert "Adding main thread binder tracing in development build."" into udc-qpr-dev