Use static linkage to reduce user/userdebug differences
am: 73fe94d196

Change-Id: Ie930833f6f1f923de272f1ac2f2413629dfa6c28