Merge "Revert "Migrate PlatformLibrary to Soong""