Merge "Make atrace not depend on /dev/hwbinder." am: 228f4bdaa9
am: 10c9c24e23

Change-Id: I2dccc33d53dab6b6d7c65b03edbd9e7b0691e796