resolve encrypt timed_out test on Odroid
Merge remote-tracking branch 'origin/next' into buffer_cleanup