Merge "Remove usage of hwcomposer_defs.h." into rvc-dev