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

Change-Id: I17df2efc0a20d6e683f766f107a47c76d53942d8