Merge "Add graphics composer support for HWC > HWC1.1"