hwcomposer changes to be inline with framework files