Merge "Reorganize sdklib.repository packages."