Merge "Remove hwcomposer2.h" into rvc-dev am: 8c0eb7fdbe am: 2c358fe6ba

Change-Id: I2b6c3661de9c9f40be3d1960e9c366348c203578