am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."

* commit '4c1d4a0e8ec344799813ce5e6642946839e0036a':
  Be more intention-revealing with libcutils' strlcpy.