Merge "fix: ATRACE does not work for libs loaded in sphal namespace" into oc-dev am: b560e6db6a
am: 94baf7270a

Change-Id: I5042241c4239800a4b8ff1f18db1ab66b029c5c3