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

Change-Id: I0006a78e0a9937b1bba651cef6a7dc33be087a04