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

Change-Id: Ic1e29e8d1e91ab34c3b7d5f7ad3e25c48a150888