Merge "aosp_arm64: increase userdata image size"