Merge "Remove unneeded links with dynamic libraries" am: 46d0a5b493
am: 4f197ec220

Change-Id: I57975a4757e6b6397958bfa5219920e918d39ad6