Merge "libhwc2on{1,fb}adapter: move to hardware/interfaces"