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

Change-Id: Ia0c596357a095aac7997ab4eb6c5df9280046586