[automerger skipped] Merge "Make swcodec service link to no-binder version of...

[automerger skipped] Merge "Make swcodec service link to no-binder version of bufferqueue" into rvc-dev am: 6b4d9a1f am: 4e094372 am: ac69b535 -s ours am: cfa62d65 -s ours
am skip reason: Change-Id Ib356e65019dba4495f2fc1eb6db6de4ff251bbde with SHA-1 9da62e1c is in history

Change-Id: I1d67a15d2cc94783c01451a75a0b70b8ea35d70a