Removing the NONE partition check from horz_4 and
vert_4 partition search conditions provides another
5-10% speedup at very little loss.

Change-Id: Ie5f14191efe6d2b0695b27021de96ad0a1550f26