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

Change-Id: I4c455d79f353d269a67fc7201b13c7a512732d99