Use the current block's skip flag to determine edge skipping. Change-Id: I4ba81f899286afbc3f6bb83eba2ef146a01b6fa4