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

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

Change-Id: I7b293f1f8c291a2253c6dd6bf4411981f3560d70