Re-order the PSK cipher suites so they are in alphabetical order. (cherry-picked from commit 7f1e8e23) Bug: 27041019 Change-Id: I20d17ccea0a1f6ca86a6690f227745ee15fd1e39