Merge "Upgrade graphics.composer HAL from 2.1 to 2.2" into master-cuttlefish-testing