Merge "VideoEnc Test: extend lockYCbCr() to hal yuv formats" into oc-dev am: 452fe6aef2
am: 72ba614357

Change-Id: I9599e066e6e00c1c320212fe8d5cc9d02bfacd50