Merge "Tracking SamplingProfiler change in libcore"