Neymar extends Barcelona contract until 2021