Merge "Make current-api-xml use generated current.txt"