clang and mac 10.9 fixes.
strlcpy is a macro defined by the system libraries in Xcode 5.
This causes a duplicate definition error.

Change-Id: I4d40a9e8ef13d7d7cf8bfa9d9d02b73febfcbe38
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
Merge remote-tracking branch 'cm/cm-10.2' into HEAD