Merge "Link libvndksupport dynamically instead of statically." am: 185ce28850 am: f06fa5ff30

Change-Id: I880d163c86ad11e2708a3943502a063ae904203c