Merge "libhwcomposer: Support for targets where libskia is not present"