client: clean up. finish moving all Android stuff to pkg/client/android

Change-Id: Ia3d19a323d9c734a01ec9a12509b115191afcfdd