Neymar extends Barca contract until 2021