Revert^2 "Merge remote-tracking branch 'origin/upstream' am: 18bbccad84"

This reverts commit fbc7176606874244085655f94f3305cbfb44fccf.

Reason for revert: the missing libmls_rs_codec dependency is now present in main: http://ac/external/rust/crates/mls-rs-codec/

I believe the problem was that the change in https://r.android.com/3049514 wasn't atomic in the way I thought it was.

Bug: 328421156
Bug: 336268123
Change-Id: I8dac5b8d69bf10f76882c9f43a27bba874e0b5de
33 files changed