Merge changes I65474a11,I1e01653c into main

* changes:
  Fix all clippy lints.
  Add Android.bp files for name_and_version and name_and_version_map.