Short Solent Flying Boat, RMA Aotearoa under construction