Align invokedynamic support in build with 2.2.X/master