Conflicts: vp10/common/scan.c vp9/common/vp9_pred_common.c vp9/decoder/vp9_decoder.c Change-Id: Id559d98ea676da15d60ed464ddb6c48d3eed1111