Merge "Moving composer@2.1 library away from shared" am: 762a556c11 am: f9db4a4fcd am: 6f15603c5d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1484877

Change-Id: Ie805ad8b5ae8cf0474ff0b5d82996aa823261bb1