[automerger skipped] Merge "Enable dyanmic image size for GSI"
am: 959701f1a8  -s ours

Change-Id: I2d218636e18a9bedb3610e7ef0aed33e39707883