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

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

Change-Id: Ica2a3d7cd6fd3d04f7f1d6f4674e24067053c956