Merge "[Cleanup] Properly export lib headers."