Nuttx merge 0f2decb

Let's try another NuttX merge, this time pull up to NuttX 6.24.