Merge "Revert "Remove sdk_version if platform_apis is set""