Modify <repository> by alphabetical order

other minor changes: remove tabs in the file

Change-Id: Ia1d690a448d080032d08967ae7b23a24bebc1c2e
Signed-off-by: George Zhao <george.y.zhao@huawei.com>
Merge "Modify <repository> by alphabetical order"