Merge commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp * commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e': Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
Merge commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp * commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e': Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.