Merge "Stop using weak symbols in libvndksupport."