Merge "Remove hwcomposer2.h" into rvc-dev