Merge "Link libvndksupport dynamically instead of statically." am: 4b33ccbb0e am: d8f23ce9c5

Change-Id: Id2659b0ad10b52af5c6d1f50542811257192d696