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