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

Change-Id: Idad6dcab068d2a9c50949b83eda660149dbdae76