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

Change-Id: I6e82e0ef68e1acdc617efe436873218f22a51412