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

Change-Id: I866e0b307a6382b2392533ad0aa0a886023fc8bf