am 55dc0907: (-s ours) am 860f7520: Always do recon of 4x4 intra blocks

* commit '55dc090755a30aafd884a95970488e44ea0914e0':