Apply upstream embedlite changes to embedlite_32