Merge "Fix oat_file_assistant_test's ReserveImageSpace()."