Minor: fix project references
AndroidClient: package rename