[automerger skipped] db845c: Sort manifest.xml entries am: 5387f5a37e -s ours
am skip reason: Change-Id I4a8dfd4a17aa5d8ea343e851b50f0d7da49de033 with SHA-1 16eb3b344e is in history

Change-Id: Ic6a5f5c9dc6203a1916e1f078db393f4c0ac9587