Resolved build error after upmerge to Nuttx 6.23