[automerger skipped] hikey: Sort manifest.xml entries am: 82dce710e1 am: bbb5c4c78a -s ours
am skip reason: skipped by user adelva

Change-Id: Ica24a3b2d60c172eb3ade665bab7a29c529b77a4