1b/ Replace removed shared lib calls with direct calls

Bug: 219861883
Test: Builds
Change-Id: I7831d0de14286c9fa39fed59b168535e0a70d94d
7 files changed