am 26584ca6: Merge "Add missing patchoatd dependency for oat_file_assistant_test."

* commit '26584ca6cee6891cf96434400b469e83a4256e84':
  Add missing patchoatd dependency for oat_file_assistant_test.