Merge "mtd: msmnand: Fix calculation of OOB size for non ONFI devices" into msm-3.0