am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp

* commit 'f978f16e50374681b0ade2d14a5e39cedaea6c2f':
  Fix the delegate method signatures in LayoutLib