am b904d53f: am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"

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