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

Change-Id: I3cd2fa66e930b6d3b012bb388350e7c62fd81891