Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev