Merge "credstore: move some libs from shared to static"