Merge "Reduce the system partition size of 32 bits GSI" into oc-mr1-dev
am: fe16a507fc

Change-Id: I5f9d529fe2d3e2c2b88b8eb0ead573ccac1443a7