am aae8d29f: (-s ours) am 90903383: [DO NOT MERGE] Support AC3 in stagefright

* commit 'aae8d29f74d05460a57d0843f6bed95d36a2145b':
  [DO NOT MERGE] Support AC3 in stagefright