Merge "Revert "Split ONS into a client apk and a lib.""