Merge "Revert "defconfig: 8226: Set ROW as the default block I/O scheduler""