Merge "Sort core-platform-api.txt for easier maintenance"