Merge "Revert "SDK libraries.""