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

Change-Id: Ibddb3898225d4c960b8c744e2a15b57efd7000b5