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