Merge "Make AndroidFuture and ServiceConnector ready for module usage."