Changed the way the Android dependent interfaces are passed in the constructor.