Merge "hikey: update the size for the partition of system and userdata" into main