Move infrastructure implementations to android app repo
Drop straw dependency