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

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

Change-Id: Id942f5ae655a2bfd8c81683e4f5ff78d26a3b0e8