am 1c513253: Merge "Experimental headers/libs"

* commit '1c513253993d7d627543215627e114d146a370ac':
  Experimental headers/libs