Merge "Framework: Remove SamplingProfiler" am: d2ecee2506
am: 3ea0309e39  -s ours

Change-Id: I41f6a58ee13d3b07298d41d9dfea330e91547b9b