Merge "otautil: Export headers." am: 2cedab7af9
am: b50d7cf9c9

Change-Id: I0e0a7da7c834cdc686d86dcc3ccc033a2317a8e4