Password Keeper?

I don't do New Year's Resolutions.  To be clear.  However, one thing I'd kind of like to do sometime real soon now is sort out my password situation.  It's a mess, with Google holding some, Apple Cloud holding some, Safari holding some, me remembering some....it's a mess, ok?

I have an Android phone, and a MacBook Air, and what I need is something that works cross platform.  Any suggestions?  And any idea how horrible it will be to transition from my current kludged state to something that is secure but actually makes sense?

Thanks in advance for any advice.