Merge "Fix the issue of NV12 input with wrong format VPX_IMG_FMT_I420" am: b12f55b3d9
am: 9370c4abf4

Change-Id: Icd0c4ad9dd77ce5f31fb13c7f84b31aa4e730df9