Merge "Add missing patchoatd dependency for oat_file_assistant_test."