diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java
index 8c1a7b3030..f7d3e70b45 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java
@@ -183,6 +183,12 @@ public final class MediaCodecUtil {
       return false;
     }
 
+    // Work around broken AAC decoders.
+    if ((Util.SDK_INT < 18 && "CIPAACDecoder".equals(name))
+        || (Util.SDK_INT < 20 && "AACDecoder".equals(name))) {
+      return false;
+    }
+
     // Work around an issue where creating a particular MP3 decoder on some devices on platform API
     // version 16 crashes mediaserver.
     if (Util.SDK_INT == 16