Merge "Call atrace HAL in atrace" am: afa55a4d6f am: bf734c7b71
am: 5ea7ac7e1b

Change-Id: I31f0ef7dacd16accb0753960e6cf595f7594c4fd