Update rust-layers for android build fix.
Merge pull request #3799 from glennw/update-layers

Update rust-layers and friends for android build fix.