Merge remote-tracking branch 'origin/upstream' am: e7fb98fce9

Original change: undetermined

Change-Id: I6e1930e426e36a1442de54545eb1ce53f9bff3e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 57babff426cee57524d30826e4c196afe1d3dd57
  1. src/
  2. Cargo.toml
  3. Cargo.toml.orig
  4. LICENSE
  5. METADATA
  6. MODULE_LICENSE_MIT
  7. OWNERS