am 95630dbb: am 913aff62: Merge "libportable to adapt L header functions."

* commit '95630dbbc1701d28a47f46e508aa3ad567121947':
  libportable to adapt L header functions.