Added library and public_header_files params.
Fixed variable name.
Merge pull request #5927 from MobileAppTracking/master

Added library and public_header_files params.