Japan, Saudi Aramco extend Okinawa crude storage deal