Merge "Make atrace not depend on /dev/hwbinder."