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

Change-Id: I2eee6a195d2ad5c494984e7d385836a892083fa7