GitLab

The order of the get_parts() dict is different between 2 and 3, which
causes entitlements to be copied in different order. Fix this by sorting
the entitlements before processing.

Also fixes a bytes vs str issue and a set() stringification difference.

Change-Id: If3e5594ce1e9d505a2ce2e3042c35a257f121daf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2320414Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791939}