am 5344f52f: am e481c006: Merge "Remove unnecessary std::move from test_dex_file_builder"

* commit '5344f52fe7104b5fc1f87ceb3e04f7d13d554cc3':
  Remove unnecessary std::move from test_dex_file_builder