Merge "Drop redundant lib/oslo"