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

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