Manuel Neuer made his long-awaited comeback as Germany slipped to a surprise 2-1 pre-World Cup friendly defeat to Austria.