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

Change-Id: Ie233de0d9c42bc6bc81c393c259baf6d3ac6318c