Merge "Fix partition configuration for auto builds" into master-cuttlefish-testing
am: 774d8740e3

Change-Id: I167c26d4df80bfcb03faa36424a39adc075cca37