Merge "Fix the delegate method signatures in LayoutLib"