am 4ed0b0b6: am 880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev

* commit '4ed0b0b6f1fb1adab5df6342d03a695545a18be3':
  stagefright: fix offloading HE-AAC sampling rate.