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

Change-Id: I121363da714c440994fb3aa25edc2632fc9e1e09