Merge "Move hiddenapi sort preupload tools to tools/platform-compat"