Merge "Upgrade to nom-7." am: f8576eaeb6 am: 1ff204f380

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/cexpr/+/1840658

Change-Id: Ie96b93b3e271531962542358797bf8e8d0e1de4a