Dubai airport expansion plan revised to $2.5 billion