Minor tweak to make update.py happy

Fairly lame to do this instead of just fixing update.py, but we
seem to do it this way everywhere else, so ...

Change-Id: Ie1cebcfec57c6138b9b726d7d3bc6e0ea456f146
Fix sorting in test-requires

Change-Id: Ic45ac7c85dbe2834d7b325ba8babf71429b277b0