Merge "atrace: support HAL services as well." am: 1aea108920 am: 7d7cd0cc88 am: 14ee7d4b21
am: 071ce9d83c

Change-Id: I80063296594ff5d4b3eff9c940ef1582109dca34