am ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-dev

* commit 'ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258':
  stagefright: do not offload LD-AAC decoding