Merge "Fix the build"

Author: Fabrice Di Meglio

api/current.txt

@@ -614,10 +614,10 @@ package android {
     field public static final int layout_height = 16842997; // 0x10100f5
     field public static final int layout_margin = 16842998; // 0x10100f6
     field public static final int layout_marginBottom = 16843002; // 0x10100fa
-    field public static final int layout_marginEnd = 16843690; // 0x10103aa
+    field public static final int layout_marginEnd = 16843692; // 0x10103ac
     field public static final int layout_marginLeft = 16842999; // 0x10100f7
     field public static final int layout_marginRight = 16843001; // 0x10100f9
-    field public static final int layout_marginStart = 16843689; // 0x10103a9
+    field public static final int layout_marginStart = 16843691; // 0x10103ab
     field public static final int layout_marginTop = 16843000; // 0x10100f8
     field public static final int layout_row = 16843643; // 0x101037b
     field public static final int layout_rowSpan = 16843644; // 0x101037c