diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java
index c4da821d81..bd3ac80b64 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java
@@ -35,7 +35,7 @@ public class ApkInfo implements YamlSerializable {
         "AndroidManifest\\.xml|META-INF/[^/]+\\.(RSA|SF|MF)|stamp-cert-sha256");
 
     public final static Pattern STANDARD_FILENAMES_PATTERN = Pattern.compile(
-        "[^/]+\\.dex|resources\\.arsc|(" + String.join("|", RESOURCES_DIRNAMES) + "|" + 
+        "[^/]+\\.dex|resources\\.arsc|(" + String.join("|", RESOURCES_DIRNAMES) + "|" +
         String.join("|", RAW_DIRNAMES) + ")/.*|" + ORIGINAL_FILENAMES_PATTERN.pattern());
 
     // only set when loaded from a file (not a stream)
@@ -180,6 +180,8 @@ private int mapSdkShorthandToVersion(String sdkVersion) {
             case "VANILLAICECREAM":
             case "VANILLA_ICE_CREAM":
                 return ResConfigFlags.SDK_VANILLA_ICE_CREAM;
+            case "BAKLAVA":
+                return ResConfigFlags.SDK_BAKLAVA;
             case "SDK_CUR_DEVELOPMENT":
                 return ResConfigFlags.SDK_DEVELOPMENT;
             default:
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
index 940fb549f3..ea1e350b14 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
@@ -571,6 +571,10 @@ public int hashCode() {
     public final static byte SDK_UPSIDEDOWN_CAKE = 34;
     public final static byte SDK_VANILLA_ICE_CREAM = 35;
 
+    // AOSP changed Build IDs during QPR2 of API 34 (Upsidedown Cake), restarting at A.
+    // However, API 35 (Vanilla) took letter A (AP2A), so we start at B.
+    public final static byte SDK_BAKLAVA = 36;
+
     // AOSP has this as 10,000 for dev purposes.
     // platform_frameworks_base/commit/c7a1109a1fe0771d4c9b572dcf178e2779fc4f2d
     public final static int SDK_DEVELOPMENT = 10000;
diff --git a/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar b/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar
index 3e79d4bcae..731454b111 100644
Binary files a/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar and b/brut.apktool/apktool-lib/src/main/resources/brut/androlib/android-framework.jar differ