Android-Sofia Fully Integrated...hopefully?

We need to test as we and not wait until the end.