Merge "hal: Fix strncat problem, replace with strlcat"