Merge "Remove hwcomposer2.h" into rvc-dev am: 8c0eb7fdbe am: 2c358fe6ba am: 283caba093 am: 57d5a0dcba am: 9fef7acb1e

Change-Id: I2b868508c501a8a915c8e8d86246fc0140561e49