Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp