Resolved build errors after upmerge to Nuttx 6.25