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

Change-Id: Ifd53f9b42547a07e877ecb7d381f21cb3bb2f87b