Merge "Tracking changes to *-host for host shared libraries"