[automerger skipped] hikey: Sort manifest.xml entries am: 82dce710e1 am: bbb5c4c78a -s ours am: 30a6a809b9

Change-Id: I22e3242b1aad21f6e6edfd0cd042c69ff483315e