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

* commit '6f013be090fcbec5e36c5a7bce98728373c8dcc1':