Merge "Remove unnecessary link library" am: f5e2c5d0f8 am: bbeb7f3a1a
am: 61bd6224a7

Change-Id: Ic4452bef526aa133eaf292d22a098e84135bfadd