Merge "Allow HWC to be binderized"