am de38dc72: am 1556d399: am 5624f5b9: am 1c513253: Merge "Experimental headers/libs"

* commit 'de38dc7279c9e5cea6d4255b3614625895646a70':
  Experimental headers/libs