[automerger skipped] Merge "DO NOT MERGE: add color converter for NV12 to RGB" am: c041f3043a  -s ours
am: 74611159fa  -s ours

Change-Id: I823d0a895c01c97de58f3365bd81f114f429ac60