Merge "Add strace back onto userdebug builds"