Move sorting back to loading thread.

Bug: 31062455
Change-Id: If248f7556d8d70b626546cecabf3377e531fd5b2
11 files changed