Merge "lambda: Infrastructure to support capture/liberate-variable dex opcodes"