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

Change-Id: I146b8e259e267679ba7d1996e8f3f5de2fe66346