Merge "Remove unnecessary link library"
am: f5e2c5d0f8

Change-Id: I11caf048048d9c8e0f51d2ffa12144014b9de804