MPB, Pagode, Samba