Android S V2 Preview 1
Merge "Revert "Migrate PlatformLibrary to Soong""