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

Change-Id: I34d24a3f61109a305875c0d2a5c23989fe34f255