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

Change-Id: Iac0430699cd15f59ed68b41d20010165a50a50e2