Merge "Pass partition size to mkuserimg.sh"