Merge "graphics.composer@2.2 rc remove interface decls" into rvc-dev am: 6b2eaec3a6

Change-Id: I1d1f0226f0003d22c73d9909e051861da733d80d