Merge "atrace: support HAL services as well." am: 1aea108920
am: 7d7cd0cc88

Change-Id: I52a8b3ffcc4bea2b2adb290de6a989b225f447e4