am 87ea6cfb: (-s ours) am bc2cdfa8: am b81c410a: Merge "Added file permissions for binder tracing"

* commit '87ea6cfb6219222fef991713aba21a739bf4f121':