Merge "Update hwcomposer include paths"