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

Change-Id: If989c3990ed4570ba0feb09a62ecf3e6359d9c0f