Merge "Remove unneeded links with dynamic libraries" am: 46d0a5b493 am: 4f197ec220 am: b3250b0b8a
am: 66ded7d95b  -s ours

Change-Id: I690a379d501114c0b408fb3d8be55dbf272d3fc2