Merge "Update Cuttlefish HWComposer to support Gralloc4" into rvc-dev am: 6543a9d8be

Change-Id: I732e66cc0e02400a40166b8812e2b535cd73afb1