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

Change-Id: I4792714f580ea5ae58ef6f5d2ca5886744f00a67