Merge "libc: Pick up changes from the TF-A code base"