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

Change-Id: I4ce317e5344f3f13a94e367cc38d9fee80709513