Merge changes from topic 'libutils-export-headers'
am: 4af3a7966b

Change-Id: I390c56cfc6312ded05ee359931faabf9517c4067