am b204391f: am ba2f27fb: Merge "Removal of more sampling profiler bits" into gingerbread

Merge commit 'b204391f6846801c3df9cd5265340e256fb86ee5'

* commit 'b204391f6846801c3df9cd5265340e256fb86ee5':
  Removal of more sampling profiler bits