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

Change-Id: I0b324dae9819ca5ee3d717f909c7788031edd989