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

Change-Id: I411e1d562b50773f2517cdd2baea015ff1bbbc4b