Order the opts files alphabetically while at it. Change-Id: I40c197fc0dc2199dd5a7b0d1d820dee1338c1703