Merge "Implement lockYCbCr stub for Mapper 4.0" into rvc-dev am: 2540a38771 am: 125ccb95ee

Change-Id: I1e845e7268cdf2c408ac381c82327267c825af5e