Merge "Create libhwc2on1adapter"