Change-Id: I7f5e15f4d5e285a85e01fdeaede747e88d08510d
Reduces shared library count by one... This is tedious. Change-Id: I3bdc0a5c4ee4cabf9bbcedc469ca6e94d0103d6b