Merge "Upgrade graphics.composer HAL from 2.1 to 2.2" am: f9988866ad
am: fdb238a99a

Change-Id: I2b2b5ec9a99abfa9204cfd584e9f3fa29c1b12f2